From: Dan Nicolaescu Date: Thu, 29 Jul 2010 06:12:38 +0000 (-0700) Subject: * src/vm-limit.c: Do not include sys/resource.h, mem-limits.h does it. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7112 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=12bf6579b8fa4033c948721df121d82b1af1c881;p=emacs.git * src/vm-limit.c: Do not include sys/resource.h, mem-limits.h does it. Remove reference to __osf__, unused. --- diff --git a/src/ChangeLog b/src/ChangeLog index 80215740571..324a9f7e135 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-07-29 Dan Nicolaescu + * vm-limit.c: Do not include sys/resource.h, mem-limits.h does it. + Remove reference to __osf__, unused. + * mem-limits.h: Remove duplicated includes. (NULL): Remove definition, unused. (POINTER): Remove definition. diff --git a/src/vm-limit.c b/src/vm-limit.c index 71ad82d687e..e0bd77a2516 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -25,10 +25,6 @@ along with GNU Emacs. If not, see . */ #include "mem-limits.h" -#ifdef HAVE_GETRLIMIT -#include -#endif - /* Level number of warnings already issued. 0 -- no warnings issued. @@ -100,7 +96,7 @@ get_lim_data (void) } #else -#if !defined (BSD4_2) && !defined (__osf__) && !defined (CYGWIN) +#if !defined (BSD4_2) && !defined (CYGWIN) #ifdef MSDOS void @@ -148,7 +144,7 @@ get_lim_data (void) } #endif /* not MSDOS */ -#else /* BSD4_2 */ +#else /* BSD4_2 || CYGWIN */ static void get_lim_data (void)